build: Fix build with meson >= 47.0

With meson >= 47.0, building gnome-shell will fail
when --rebuild-types is used as an option for gtk-doc,
so stop using that option and bump the meson requirement.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191

diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build
index 1469ed422a88d270d6c782c039a5cb90670f849e..a32d6a58a1729adfdfb87aade11c1fcc401722b1 100644 (file)
--- a/docs/reference/shell/meson.build
+++ b/docs/reference/shell/meson.build
@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
     join_paths(meson.build_root(), 'src')
   ],
   scan_args: [
-    '--ignore-headers=' + ' '.join(private_headers + exclude_directories),
-    '--rebuild-types'
+    '--ignore-headers=' + ' '.join(private_headers + exclude_directories)
   ],
   install: true
 )

diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
index fe89b53d47a5004480e23dd575d68d9b5a2e7c52..3e9e9ab7ca65c398c4b5b993fe4b580d233eb1a7 100644 (file)
--- a/docs/reference/st/meson.build
+++ b/docs/reference/st/meson.build
@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
   ],
   scan_args: [
     '--ignore-headers=' + ' '.join(private_headers),
-    '--rebuild-sections',
-    '--rebuild-types'
+    '--rebuild-sections'
   ],
   install: true
 )

diff --git a/meson.build b/meson.build
index 03b9d52a82c5a1d3bd725e0c53841a16358e665a..e33a761834ef00c263bd50b7424b0f608d4c7335 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gnome-shell', 'c',
   version: '3.29.90',
-  meson_version: '>= 0.42.0',
+  meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )